Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

ENH: finish pre-flight checkout, add pmps boilerplate #6

Merged
merged 2 commits into from
Jun 27, 2024
Merged

ENH: finish pre-flight checkout, add pmps boilerplate #6

merged 2 commits into from
Jun 27, 2024

Conversation

nrwslac
Copy link
Contributor

@nrwslac nrwslac commented Jun 19, 2024 •
edited
Loading

Description

Motivation and Context

Prepare TXI to take beam.

How Has This Been Tested?

  • We sent and received test values from TXI optics and to the arbiter.
  • Running on PLC

Where Has This Been Documented?

https://jira.slac.stanford.edu/browse/ECS-5580
https://confluence.slac.stanford.edu/display/L2SI/MR1K3+Pre-Flight+Results+6-18-2024?src=jira
https://confluence.slac.stanford.edu/display/L2SI/MR2K3+Pre-Flight+Results+6-18-2024?src=jira

Screenshots (if appropriate):

Pre-merge checklist

  • Code works interactively
  • Code contains descriptive comments
  • Test suite passes locally
  • Libraries are set to fixed versions and not Always Newest
  • Code committed with pre-commit (alternatively pre-commit run --all-files)

nrwslac
nrwslac commented Jun 26, 2024
View reviewed changes
lcls-plc-txi-optics/txi_optics/POUs/PRG_2_PMPS_POST.TcPOU
//i_xOK := GVL_PMPS.fbFastFaultOutput2.q_xFastFaultOut);

//Code for Removing arbitration
GVL_PMPS.fbArbiter1.AddRequest(nReqID := 49, stReqBp := PMPS_GVL.cstFullBeam, sDevName := 'txi-kfe-optics');
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

https://confluence.slac.stanford.edu/display/L2SI/PMPS+Preemptive+Request+IDs

@nrwslac nrwslac requested review from ghalym and ZLLentz June 26, 2024 22:03
ZLLentz
ZLLentz approved these changes Jun 26, 2024
View reviewed changes
Copy link
Member

@ZLLentz ZLLentz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I noted the tiny things I saw when stepping through this
By and large looks normal and good and solid 👍
The most improvable thing is the lack of vetoes but I understand the specifics are still an ongoing discussion

lcls-plc-txi-optics/_Config/NC/Axes/M2K3-Yup.xti
@@ -1318,6 +1318,7 @@ External Setpoint Generation:
<Axis Id="6" CreateSymbols="true" AxisType="1" AxisFolder="M2K3">
<Name>__FILENAME__</Name>
<AxisPara>
<General UnitName=""/>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

UnitName = empty string looks a little bit suspect

lcls-plc-txi-optics/txi_optics/POUs/PRG_1_PlcTask.TcPOU
END_VAR
]]></Declaration>
<Implementation>
<ST><![CDATA[PRG_2_PMPS_POST();
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's non-standard that PMPS_POST is not the final program run, but I'm not sure how much it matters. Maybe this will delay faults from MR1K3 and MR2K3 until the next cycle?

Edit: I see now that the following programs don't do anything that may result in a fast fault, so probably no impact

lcls-plc-txi-optics/txi_optics/POUs/PRG_2_PMPS_POST.TcPOU
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's notable that there are no vetoes here- perhaps this is related to the txi time crunch? Perhaps TXI optics have no veto conditions?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yeap, there are no pmps constraints in the program currently.

@nrwslac nrwslac merged commit 8ff9265 into pcdshub:master Jun 27, 2024
9 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ZLLentz ZLLentz ZLLentz approved these changes

@ghalym ghalym Awaiting requested review from ghalym

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@nrwslac @ZLLentz